added conversion to matrix + av calculation
removed obsolete files