Sorting added
some clean-up
Removed unnecessary files from the project.