All client and conductor updates

I was able to merge these into your master on my end, so the merge should go seamlessly. 

Updated client UI, Conductor UI, and better directory structure for endpoints.