Refactored module.py and removed dynamic attribute assignment to replace it with dictionaries.  Updated fitting.py to reflect changes.