Migrate to new folder architecture