Refactoring package structure and getting rid of obsolete classes