BMS-204 : rearranging packaging for a more generic life in the Middleware