improved bundle with better config, generator, controller