Reorganized data classes & continued FileManager