Client maintenance

Reorganized files, deleting unneeded ones. Also brought client-side views and logic up to date.