remade folder hierarchy