Reorganised folders + updated readme