Added config file support
Removed testign dir