More improvements + Removed few duplicate classes
Moved config file outside