Removed unused folders
Fixed stupid merge conflicts of VS
 Resolved