Merge basics and common directories to basics
Rename to JsonFields.h in protocol
Normalize basics include guards