Revert "Classes melhoradas"

This reverts commit 0a973e4c9077c9b7d9d909be20dc96b35eef18fe.