Straighten out modules
Continue modularization
Update default.cnfg
Finish modularization
Fix curl connection; change configfile format