some modifications in file names, namespaces and classes
added bunch of classes and test
need to run phpunit and make sure everything is working