Re-group code.
Re-group code.


Former-commit-id: 4bb01d424dd14f1a192d38fd6a1756d2d6313216 [formerly c98159ed2989487e30a1c22eb2df9e55709d0806]
Former-commit-id: 50c7fada670dc85330524be209e4f597f9c11f82
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine