Added CC computer support and moved around some classes