moved averaging classes to core module, added tests, removed obsolete stuff