Fixed dependencies.
Fixed resources
Changed Class names