Working on Master doc, reorganised directories, seded various stuff