Cleaning up hierarchy
Removing old files