More structure, using .json files as much as possible