Updated folder structure
Removed extra code
Fixed errors