reformat repositories and models, add services