File Changes

Renamed some files and deleted others to clean up the dev environment.