Moved public Modules to API namespace, much cleaner now.