Merge qplan module

        - This removes all of the server C files (these have gone to catserve)