Cleaning up the code

renaming and removing old files