#396 Splitted optional (and Work in progress) bundles to separate repos