refactor into separate Git project