Adding Objects and re-organizing data structures