Ooo soo pretty, recursive module registration!
Bug fixes