Customising top level folders (backtrack from last commit)
Cleanup