Refactoring after moving of classes and enumerations
Move the class into the internal package
Move the enumeration into the internal package
Added internal package