Some refactoring; generator now produces a complete package in another directory