Cleaning up directory layout