Renames for clarity. Removed unused files.