big refactor for command functionality
rm old/unused files