Restructure module hierarchy and add setup.py
Remove needless lines