Renamed files/classes, added IsValidId method.