Clean up of folder structure