changing dir structure, prepare for setup.py