classes commited together json creator and small reorganisation