Refactor to single file
Modify path to source