Refactoring and fixes

Refactored some classes and names
Added a facade
Fixed configuration file
Better coding (IoC)