Last refactor for class changes, this makes it a bit more sensible by putting them in a API Package, CommandBuilder isn't in the package though.