Changed class names
Added dependencyinjection.json and functional tests