Rebuild to correct folders.