Refactored new code into separate projects.