Improved class structure. Making way for great things!