Moved some classes, now log handler works correctly