Fixed the linker errors (functions didn't have their classes)