Fixes file layout after initial import