Resturcture files

Cleaned up the root directory and changed package references to make project cleaner