Organize
Remove command line stuff (for now)