refatorando as classes
conflitos resolvidos... mas dando pau