Clean up folder structure