new file structure and v1.0.2