Refactoring - prep for require paths