Removed unnecessary comments

and subfolders have been organized