re-organizing the sample application