(refactor) Modify repo to work with CircleCI