merged everything but the app folder