restructuring dir layout to support multi modules