Reorganization prior to implementing FileName class