Clean Up

Cleaning up where files live and removing duplicate files.