Moved client stuff to client directory