Editing to match new structure

Still fixing the structure and removed unused files