Reorganized data structure, now everytihng is object oriented!