dacho-sm, dacho-sm-api, folder restructure