Rebased files into proper directory