Moved classes into their relevant packages for further refactoring