diff --git a/piplot/main.py b/piplot/main.py
index fd4b348..55a23d9 100755
--- a/piplot/main.py
+++ b/piplot/main.py
@@ -5,8 +5,8 @@ import sys
 import time
 import RPi.GPIO as GPIO
 from RPLCD.gpio import CharLCD
-from src.config import *
-from src.menu import menu
+from piplot.config import *
+from piplot.menu import menu
 
 ###################################################################
 
diff --git a/setup.py b/setup.py
index 421e199..64d87d6 100755
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,9 @@
-import setuptools
+from setuptools import setup, find_packages
 
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
-setuptools.setup(
+setup(
     name="PiPlot2D",
     version="0.0.1",
     author="sinseman44",
@@ -12,7 +12,8 @@ setuptools.setup(
     long_description="Control PiPlot2D system",
     long_description_content_type="text/markdown",
     url="https://github.com/sinseman44/PiPlot2D",
-    packages=setuptools.find_packages(where='piplot'),
+    #packages=setuptools.find_packages(where='piplot'),
+    packages=find_packages(),
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",