Removing new entity factory
Adding UserModule (fixes #2, #3, #4)