Trying to un-break renamed directory structure for easier merge...