reconstruct make.py
adjust file structure