rearanged directory structure