Include directory change, last vestiges of 'Frames'
Move input gathering into a Frame module