File restructure
Merge branch 'touchscreen'