slight namespace reorg, and started adding # ABSTRACT comment to the top of all files