simplified directory stucture
simplified directory stucture