File cleanup & reorganization