SWITCHYARD-1536 eliminate split packages in core

https://issues.jboss.org/browse/SWITCHYARD-1536