Move files around and fix the GPL.