Updated lib curl header include to fix build. Continued cleanup and restructuring of source code.