Updated and Refactored Classes

Also modified FeatureScalingFunctions.py