remove any scramble things in the client
rename files for consistency
Updated docs, minor bugfixes