seperate files, remove swipe