Fixed bundle structure
Added service and some doc