Added Modules::info()
Grouped includes and moved closures