Added folder structure
Fixed location issues
Fixed names issue