reorganize structure like flask-kit