Update to file structure

Just cleaning up the project and making the appropriate files