File re-arrage to allow clean merge?