Updated folder name and changed namespace