Moving controllers into a class - dealing with module scope

Compilation requires references to the included classes, and they
must be exported to make them accessible. Could possibly do this
slightly differently - not expose the internal controllers.

Anyway, it is working