file restructure

needed to change some directories to allow setup.py to work