Reorganize folders around new setup.py