Refactoring structure, removing old files
Completed restructure and build