Re-introduce modulus op
Rename file