Delete several files as a result of renaming them
Add renamed files back into package