Updated setup.py with new directory structure