Unify codebase (#249)