Clean up root directory by using subdirs