renaming some files to match convention and removing measure xml