Fix extraneous imports in aggregate
Organize command into cmd folder