restructure config
restructure for pimple 2.1
restructure is nearly finished