Cleaned up and renamed files to make it easier to recognize what we have