reorganises user & member modules, closes Issue #281

reorganises user & member modules, closes Issue #281