Removed File class. Replaced with Marking package