cleaned up initial generation, added subgenerators for views and collections
cleanup and subgenerators