Created setup.py and rejigged dir structure