Draft for new module hierarchy and naming conventions

A first draft to respond to the issue gh-7