Move stuff into /app