File reorganization and single view work