Made proper gem structure