cleanup pattern and generator annotations to better enable code generation. Add the CQRS pattern