Massive file restructure