Major reorganisation and deleted many files