Moving files and adding new measures