refactor activemq package