Improve the README file, and shuffle around modules again