Removing old files
Rearanged file structure.