folders restructured and some files renamed