+ Split all classes into seperat files.
+ Capitalized Properties
+ Removed overloaded addWithSubstring function. Instead now takes an optional Parameter.
+ Added a couple of Docstrings