Restructure and config settings