Core: Correct module include paths