Restructuring app to better use Travis testing