Split Elocmd to multiple modules