move out of vendor into apps