Move some methods to the module manager and fix some includes
tree7a8ded040acd644dafffcd11ef388f474b923c89
drwxr-xr-x - src