Revert "name changes to server, lib, and layout"

This reverts commit e9192c02afd28e2f87c685af2b24723441412240.