Hardcoded global module paths removed