Moving from vendor to app directory