Renamed some class and method names. Added ann used a class for config parser