reorganzing, adding keys config file