moved ore dictionary entries into new class