org: some changed API
properly load stuff on compilation