File cleanup & reorganize