Minor changes to finish project
Remove directories
Add folders