Consolidated server files (but /public is still out)