Removing things from master that are in archive
Removing more things from master that are in archive, and re-arranging files