Starting to pull module types out into it's own datatype of "definitions"
Switching from .done() to .then()
Cleanup