Refactor project to prepare for gestures