Rework of dir structure and readme.