Big refactoring
finally removed all those requiraments of config file