moving classes to specified packages, little refactor, comments