rename model templetes and start working on join tables