Moved some Model logic to the appropriate model files in both inventory and user logic.