Moved objects to own folder, made lots og handlers work.