refactored packages and groups to org.elasticsotfware