made the directory structure simpler