Changes files to reflect the new structure used by geddy