Cleaned up code

address.py

@@ -198,7 +198,7 @@
             'wrist', 'write', 'wrong', 'yard', 'year', 'yellow', 'you', 'young', 'youth', 'zebra', 'zero', 'zone',
             'zoo']
 
-class Address(object):
+class pyAddress(object):
     def __init__(self, pycwaves, address='', publicKey='', privateKey='', seed='', alias='', nonce=0):
         self.pycwaves = pycwaves
         if nonce<0 or nonce>4294967295:

asset.py

@@ -1,7 +1,7 @@
 #import pywaves
 import logging
 
-class Asset(object):
+class pyAsset(object):
     def __init__(self, assetId, pycwaves):
         self.pycwaves = pycwaves
         self.assetId='' if assetId == self.pycwaves.DEFAULT_CURRENCY else assetId
@@ -49,7 +49,7 @@ def isSmart(self):
         else:
             return False
 
-class AssetPair(object):
+class pyAssetPair(object):
     def __init__(self, asset1, asset2, pycwaves):
         self.pycwaves = pycwaves
         self.asset1 = asset1

contract.py

@@ -1,7 +1,7 @@
 import requests
 #import pywaves as pw
 
-class Contract(object):
+class pyContract(object):
 
     def __init__(self, contractAddress, seed, pycwaves):
         self.pycwaves = pycwaves

oracle.py

@@ -1,7 +1,7 @@
 import requests
 #import pywaves as pw
 
-class Oracle(object):
+class pyOracle(object):
 
     def __init__(self, pycwaves, oracleAddress = None, seed = None):
         self.pycwaves = pycwaves

order.py

@@ -1,6 +1,6 @@
 #import pywaves
 
-class Order(object):
+class pyOrder(object):
     def __init__(self, pycwaves, orderId, assetPair, address = ''):
         self.pycwaves = pycwaves
         self.orderId = orderId

pycwaves.py

@@ -19,9 +19,13 @@
 
 class PyCWaves(object):
     def __init__(self):
-        self.Address = object
-        self.Asset = object
-        self.AssetPair = object
+        #self.Address = object
+        #self.Asset = object
+        #self.AssetPair = object
+        #self.Order = object
+        #self.Contract = object
+        #self.Oracle = object
+
         self.DEFAULT_TX_FEE = 100000
         self.DEFAULT_BASE_FEE = self.DEFAULT_TX_FEE
         self.DEFAULT_SMART_FEE = 400000
@@ -64,27 +68,44 @@ def __init__(self):
         console.setFormatter(formatter)
         logging.getLogger('').addHandler(console)
 
-        self.WAVES = Asset('', self)
-        self.BTC = Asset('8LQW8f7P5d5PZM7GtZEBgaqRPGSzS3DfPuiXrURJ4AJS', self)
-        self.USD = Asset('Ft8X1v1LTa1ABafufpaCWyVj8KkaxUWE6xBhW6sNFJck', self)
+        self.WAVES = pyAsset('', self)
+        self.BTC = pyAsset('8LQW8f7P5d5PZM7GtZEBgaqRPGSzS3DfPuiXrURJ4AJS', self)
+        self.USD = pyAsset('Ft8X1v1LTa1ABafufpaCWyVj8KkaxUWE6xBhW6sNFJck', self)
+
+    def Address(self, address='', publicKey='', privateKey='', seed='', alias='', nonce=0):
+        #self.Address = Address(self, address, publicKey, privateKey, seed, alias, nonce)
+        #return self.Address
+        return pyAddress(self, address, publicKey, privateKey, seed, alias, nonce)
+
+    def Asset(self, assetId):
+        #self.Asset = Asset(assetId, self)
+        #return self.Asset
+        return pyAsset(assetId, self)
 
-    def pAddress(self, address='', publicKey='', privateKey='', seed='', alias='', nonce=0):
-        self.Address = Address(self, address, publicKey, privateKey, seed, alias, nonce)
-        return self.Address
+    def AssetPair(self, asset1, asset2):
+        #self.AssetPair = AssetPair(asset1, asset2, self)
+        #return self.AssetPair
+        return pyAssetPair(asset1, asset2, self)
 
-    def pAsset(self, assetId):
-        self.Asset = Asset(assetId, self)
-        return self.Asset
+    def Order(self, orderId, assetPair, address = ''):
+        #self.Order = Order(self, orderId, assetPair, address)
+        #return self.Order
+        return pyOrder(self, orderId, assetPair, address)
 
-    def pAssetPair(self, asset1, asset2):
-        self.AssetPair = AssetPair(asset1, asset2, self)
-        return self.AssetPair
+    def Contract(self, contractAddress, seed):
+        #self.Contract = Contract(contractAddress, seed, self)
+        #return self.Contract
+        return pyContract(contractAddress, seed, self)
+
+    def Oracle(self, oracleAddress, seed):
+        #self.Oracle = Oracle(self, oracleAddress, seed)
+        #return self.Oracle
+        return pyOracle(self, oracleAddress, seed)
 
     def throw_error(self, msg):
         if self.THROW_EXCEPTION_ON_ERROR:
             raise PyWavesException(msg)
 
-
     def setThrowOnError(self, throw=True):
         #global THROW_EXCEPTION_ON_ERROR
         self.THROW_EXCEPTION_ON_ERROR = throw