Changed the names and layouts of some directories