Basic server layout, small cleanup in lenslib