Started refactoring into multiple assemblies.