structure: better match upstream file structure

* Useful for easier merging