Cleaned up messy files

Removed duplicate files; cleaned up what I left