Rename module directories to follow naming conventions