HTTP cam working, some reorg and cleanup