updating files, removing old stuff with confusing nomenclature