Move to Base and rename
Use source since resource hasn't been downloaded