reorgnize directory and add comments