Moved stuff around, added addComponent to engine