Clean up of the project ; building pure json structures and mapping them to JSON-LD works extremely well so far