Completed FileSystem, ResourceLoader, DisplayCarrier, and DirectoryMaster.
Fixed merge conflict and one last change in FileSystem