master redesign directory structure for supporting Composer