Update: client sub generators
Refactor Application Generator
Refactor all client sub generators