Tidy up and prepare for entity subdirectories.