Add and use path mod functions
Rename
Rename