A failed attempt to clean up the structure as well
as well as get a setup.py script so for easy install/develop