Changed name ModulesDirectory to ModuleDirectory
some small compile error fiexes due to latest changes
...