Project CleanUp

Cleaned the project from not used files and sorted some items.