minor reorganiation
making core objects themselves serializable