updated directory layout