Added Refactoring project

Started temporary refactoring project, instead of hopelessly trying to
merge the 2 models in the original project.