Restucture directory