Rework project deserialization