refactor, fix world gen, add Bundles
Signed-off-by:Craig Russell <tenowg@gmail.com>