diff --git a/pyFTS/tests/general.py b/pyFTS/tests/general.py
index 94050bd..5318fb2 100644
--- a/pyFTS/tests/general.py
+++ b/pyFTS/tests/general.py
@@ -5,11 +5,11 @@ import os
 import numpy as np
 import pandas as pd
 import matplotlib as plt
-import matplotlib.pyplot as plt
+#import matplotlib.pyplot as plt
 #from mpl_toolkits.mplot3d import Axes3D
 
 import pandas as pd
-from pyFTS.partitioners import Grid, Entropy, FCM, Huarng
+from pyF import Grid, Entropy, FCM, Huarng
 from pyFTS.common import FLR,FuzzySet,Membership,Transformations, Util as cUtil
 from pyFTS import fts,hofts,ifts,pwfts,tree, chen
 #from pyFTS.benchmarks import benchmarks as bchmk
diff --git a/setup.py b/setup.py
index 7ab2ce1..a27cdbd 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,14 @@
 from distutils.core import setup
 setup(
   name = 'pyFTS',
-  packages = ['pyFTS'], 
+  packages = ['pyFTS','pyFTS.benchmarks','pyFTS.common','pyFTS.data', 'pyFTS.ensemble','pyFTS.models','pyFTS.partitioners','pyFTS.probabilistic','pyFTS.tests'], 
+  package_data = {'benchmarks':['*'], 'common':['*'], 'data':['*'], 'ensemble':['*'], 'models':['*'], 'partitioners':['*'], 'probabilistic':['*'], 'tests':['*']},
   version = '0.1',
   description = 'Fuzzy Time Series for Python',
   author = 'Petronio Candido L. e Silva',
   author_email = 'petronio.candido@gmail.com',
-  url = 'https://github.com/petroniocandido/pyFTSpackage',
-  download_url = 'https://github.com/petroniocandido/pyFTSpackage/archive/0.1.tar.gz',
+  url = 'https://github.com/petroniocandido/pyFTS',
+  download_url = 'https://github.com/petroniocandido/pyFTS/archive/pkg0.1.tar.gz',
   keywords = ['forecasting', 'fuzzy time series', 'fuzzy', 'time series forecasting'],
   classifiers = [],
 )