Cleaned files
Changed a bit the json structure
Fixed project configuration