Refactored pacakaging for Tibco EMS code