Moved source to client directory