relocated some files, added highliter