Changing some names and file structures.