updated bundle structure
updated configuration and services