Reorganize folders -- add 'client' folder
Begin work towards new command format

Forgot to commit this from a while ago
... forgot to finish it too. Will do soon.