Giving credit where credit is due
Moving classes into separate folder for cleanliness