Updates to module structure and README