Re-Arranging files and removing unneccesary files