re-arranging tutorial code to be more in line with Dart packaging best practices