Renamed base package to common, moved json helper there