changed some file extensions to hopefully disambiguate better