Update module to be entirely modules

* Update readme with shorthand aliases
* Iterate over composed modules to generate automatically
* Update tests with shorthands
2.1.1