Let's organize our FileSrv dirs a bit more sanely.