Merge into App Folder