Merge a heavily refactored codebase and stay sane.
(Release Candidate - 1.2.4).
YouTube: Kinetic Merge: Merging through a File Split
