Split services and rest into two bundles, hoping this will resolve CDI startup, but it didn't :(