Migrate to a more typical structure