Migrate to a FRP architecture