Clean up project structure
Remove files to be ignored
Final clean-up of project structure