Moved classes into correct packages and changed file structure to reflect it