Removed deprecated and added setup.py
Fixed bugs caused by previous reorganization