Reorganising module behaviour. Updating readme