Reduce number of packages
Refactor and rename classes in project