reorganized packages structure. setup.py from scratch