Move things around and add a profiling server