Rename modules to simply `diskfile` & `server`