Fixed per-module types and patched relative-absolute paths issues (refactoring's required)