Modifications and consolidation. Removed grep, and internals files.