added opendata folder, fixed package names accordingly