Refactor into a proper project