Changed Names of classes to make more sense. TODO: XML RPC