Added query
Changed packages structure