Moving classes into subpackages + renaming