Martinez re.structure Issue Eight

Martinez - re.structure Issue Eight