Made some changes on the classes so they would have names that sounds logical.