Restructured and began building the classses