Rename modules directory, functions