Restructuring directory layout