Deleted simple server and made some name changes