massive file restructure, as you do