Reworked the packages

Moved some java files and created some new packages