Combine Power CMS and Contact Form Solution pack

Hi I have sucessfully (with help from this forum, thank you) installed both Power CMS 102 (PCMS) and the Contact Form Solution pack (CFSP).

Taking advice from this forum I have the CFSP installed in the root of my site and the PCMS in a sub domain of that site. This was to avoid potential conflict with the WA_Gobals settings.

Apart from the added burden of having two sites to administer, i.e. css, includes etc. I would like to combine the two as there is a noticeable delay moving from main to sub domains. This can be checked using diary.php where the PCMS is installed and guyedwardes.com where I have CFSP installed. By the way, using the navigation from sub domain to main site is working but not the reverse, so don't click on diary from main site, you would need to use these links as we are still in beta test mode.

I assume I would start by creating a "CMS" folder in my main site and transfering the contents of what is currently in the subdomain. Can I also create a folder for CFSP and put all the code in there, thereby taking it out of the root and keeping the two solutions seperate? I recognise that I would have to make some adjustments to both WA_Global settings and therefore I am looking to be pointed in the right direction.

Any advice would be welcome, this is not urgent as the client has yet to notice the delay.

TIA - Mac