Long overdue commit, many new modules added and many modules changed