decoupling from projects, fixes to templates