Renamed module files and tidied doc strings