Adding initial refactor for bin/azk. #93