restructure to move remote into the app directory