Cleaning up folder structure