Initial refactor project.