Restructure and conf added