reorganisation and updated readme