rearrange structure
ignore modules