renamed some files, cleaned up a bit