Changing Class structure

Changing around the class structure to match the new DB design