Rearranging files part 2
Removed legacy code