Change require_relative to require
Merge branch 'require_refactor_branch'