project layout cleanup and setup.py