added session average calculations, refactored non-android classes to own package