Topic/bettered generators

Bettered generators and default app templates