diff --git a/setup.py b/setup.py
index 9fb2c8a..f42077a 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,8 @@ setup(name='pybtc',
       author='Alexsei Karpov',
       author_email='admin@bitaps.com',
       license='GPL-3.0',
-      packages=find_packages(),
+      package_dir={'':'src'},
+      packages=['core', 'pybtc'],
       install_requires=[ 'secp256k1'],
       include_package_data=True,
       package_data={
diff --git a/pybtc/__init__.py b/src/core/__init__.py
similarity index 100%
rename from pybtc/__init__.py
rename to src/core/__init__.py
diff --git a/pybtc/address.py b/src/core/address.py
similarity index 100%
rename from pybtc/address.py
rename to src/core/address.py
diff --git a/pybtc/bip39_word_list/chinese_simplified.txt b/src/core/bip39_word_list/chinese_simplified.txt
similarity index 100%
rename from pybtc/bip39_word_list/chinese_simplified.txt
rename to src/core/bip39_word_list/chinese_simplified.txt
diff --git a/pybtc/bip39_word_list/chinese_traditional.txt b/src/core/bip39_word_list/chinese_traditional.txt
similarity index 100%
rename from pybtc/bip39_word_list/chinese_traditional.txt
rename to src/core/bip39_word_list/chinese_traditional.txt
diff --git a/pybtc/bip39_word_list/english.txt b/src/core/bip39_word_list/english.txt
similarity index 100%
rename from pybtc/bip39_word_list/english.txt
rename to src/core/bip39_word_list/english.txt
diff --git a/pybtc/bip39_word_list/french.txt b/src/core/bip39_word_list/french.txt
similarity index 100%
rename from pybtc/bip39_word_list/french.txt
rename to src/core/bip39_word_list/french.txt
diff --git a/pybtc/bip39_word_list/italian.txt b/src/core/bip39_word_list/italian.txt
similarity index 100%
rename from pybtc/bip39_word_list/italian.txt
rename to src/core/bip39_word_list/italian.txt
diff --git a/pybtc/bip39_word_list/japanese.txt b/src/core/bip39_word_list/japanese.txt
similarity index 100%
rename from pybtc/bip39_word_list/japanese.txt
rename to src/core/bip39_word_list/japanese.txt
diff --git a/pybtc/bip39_word_list/korean.txt b/src/core/bip39_word_list/korean.txt
similarity index 100%
rename from pybtc/bip39_word_list/korean.txt
rename to src/core/bip39_word_list/korean.txt
diff --git a/pybtc/bip39_word_list/spanish.txt b/src/core/bip39_word_list/spanish.txt
similarity index 100%
rename from pybtc/bip39_word_list/spanish.txt
rename to src/core/bip39_word_list/spanish.txt
diff --git a/pybtc/block.py b/src/core/block.py
similarity index 100%
rename from pybtc/block.py
rename to src/core/block.py
diff --git a/pybtc/blockchain.py b/src/core/blockchain.py
similarity index 100%
rename from pybtc/blockchain.py
rename to src/core/blockchain.py
diff --git a/pybtc/consensus.py b/src/core/consensus.py
similarity index 100%
rename from pybtc/consensus.py
rename to src/core/consensus.py
diff --git a/pybtc/constants.py b/src/core/constants.py
similarity index 100%
rename from pybtc/constants.py
rename to src/core/constants.py
diff --git a/pybtc/functions/__init__.py b/src/core/functions/__init__.py
similarity index 100%
rename from pybtc/functions/__init__.py
rename to src/core/functions/__init__.py
diff --git a/pybtc/functions/address.py b/src/core/functions/address.py
similarity index 100%
rename from pybtc/functions/address.py
rename to src/core/functions/address.py
diff --git a/pybtc/functions/bip32.py b/src/core/functions/bip32.py
similarity index 100%
rename from pybtc/functions/bip32.py
rename to src/core/functions/bip32.py
diff --git a/pybtc/functions/bip39_mnemonic.py b/src/core/functions/bip39_mnemonic.py
similarity index 100%
rename from pybtc/functions/bip39_mnemonic.py
rename to src/core/functions/bip39_mnemonic.py
diff --git a/pybtc/functions/block.py b/src/core/functions/block.py
similarity index 100%
rename from pybtc/functions/block.py
rename to src/core/functions/block.py
diff --git a/pybtc/functions/encode.py b/src/core/functions/encode.py
similarity index 100%
rename from pybtc/functions/encode.py
rename to src/core/functions/encode.py
diff --git a/pybtc/functions/hash.py b/src/core/functions/hash.py
similarity index 100%
rename from pybtc/functions/hash.py
rename to src/core/functions/hash.py
diff --git a/pybtc/functions/key.py b/src/core/functions/key.py
similarity index 100%
rename from pybtc/functions/key.py
rename to src/core/functions/key.py
diff --git a/pybtc/functions/script.py b/src/core/functions/script.py
similarity index 100%
rename from pybtc/functions/script.py
rename to src/core/functions/script.py
diff --git a/pybtc/functions/tools.py b/src/core/functions/tools.py
similarity index 100%
rename from pybtc/functions/tools.py
rename to src/core/functions/tools.py
diff --git a/pybtc/opcodes.py b/src/core/opcodes.py
similarity index 100%
rename from pybtc/opcodes.py
rename to src/core/opcodes.py
diff --git a/pybtc/test/__init__.py b/src/core/test/__init__.py
similarity index 100%
rename from pybtc/test/__init__.py
rename to src/core/test/__init__.py
diff --git a/pybtc/test/address_class.py b/src/core/test/address_class.py
similarity index 100%
rename from pybtc/test/address_class.py
rename to src/core/test/address_class.py
diff --git a/pybtc/test/address_functions.py b/src/core/test/address_functions.py
similarity index 100%
rename from pybtc/test/address_functions.py
rename to src/core/test/address_functions.py
diff --git a/pybtc/test/block.py b/src/core/test/block.py
similarity index 100%
rename from pybtc/test/block.py
rename to src/core/test/block.py
diff --git a/pybtc/test/create_transaction.py b/src/core/test/create_transaction.py
similarity index 100%
rename from pybtc/test/create_transaction.py
rename to src/core/test/create_transaction.py
diff --git a/pybtc/test/ecdsa.py b/src/core/test/ecdsa.py
similarity index 100%
rename from pybtc/test/ecdsa.py
rename to src/core/test/ecdsa.py
diff --git a/pybtc/test/hash_functions.py b/src/core/test/hash_functions.py
similarity index 100%
rename from pybtc/test/hash_functions.py
rename to src/core/test/hash_functions.py
diff --git a/pybtc/test/integer.py b/src/core/test/integer.py
similarity index 100%
rename from pybtc/test/integer.py
rename to src/core/test/integer.py
diff --git a/pybtc/test/mnemonic.py b/src/core/test/mnemonic.py
similarity index 100%
rename from pybtc/test/mnemonic.py
rename to src/core/test/mnemonic.py
diff --git a/pybtc/test/raw_block.txt b/src/core/test/raw_block.txt
similarity index 100%
rename from pybtc/test/raw_block.txt
rename to src/core/test/raw_block.txt
diff --git a/pybtc/test/script_deserialize.py b/src/core/test/script_deserialize.py
similarity index 100%
rename from pybtc/test/script_deserialize.py
rename to src/core/test/script_deserialize.py
diff --git a/pybtc/test/script_functions.py b/src/core/test/script_functions.py
similarity index 100%
rename from pybtc/test/script_functions.py
rename to src/core/test/script_functions.py
diff --git a/pybtc/test/sighash.py b/src/core/test/sighash.py
similarity index 100%
rename from pybtc/test/sighash.py
rename to src/core/test/sighash.py
diff --git a/pybtc/test/transaction_constructor.py b/src/core/test/transaction_constructor.py
similarity index 100%
rename from pybtc/test/transaction_constructor.py
rename to src/core/test/transaction_constructor.py
diff --git a/pybtc/test/transaction_deserialize.py b/src/core/test/transaction_deserialize.py
similarity index 100%
rename from pybtc/test/transaction_deserialize.py
rename to src/core/test/transaction_deserialize.py
diff --git a/pybtc/transaction.py b/src/core/transaction.py
similarity index 100%
rename from pybtc/transaction.py
rename to src/core/transaction.py
diff --git a/pybtc/wallet.py b/src/core/wallet.py
similarity index 100%
rename from pybtc/wallet.py
rename to src/core/wallet.py
diff --git a/src/pybtc/__init__.py b/src/pybtc/__init__.py
new file mode 100644
index 0000000..4fcabbf
--- /dev/null
+++ b/src/pybtc/__init__.py
@@ -0,0 +1 @@
+from ..core import *