Cleanup

Cleaned up naming, deleted unneeded files