Refactoring of existing codebase

This is a patch update that includes a major revamp of almost the entire codebase. The user-level behaviour is the same and there are no breaking changes.