restructured and added config