Move some more things into subdirectories to clean