Moved files, split up client