Updated moduleloader hook to take advantage of the new "flattenDirectories" and "keepDirectoryPath" options
Updated controllers hook to remove nasty code that was used to handle nested controllers, since includeAll can do that for us now.