[partial update] ported commands to a separate file