More sorting out after moving files around