massive rework of architecture, put diff apps n diff dirs