Refactoring, added Trait and Interface generators
Added Interface and Trait templates