client structure changed
mixture now in simple mode
gitignore .DS_Store