Update/documentation after refactor

Please merge this AFTER #2, as it is branched off that.