Few changes

renamed a dir, and did some changes that were nedded