Refactoring of src of bus and cdi demos