Consolidation, renaming, and revision

updated and deleted files