reorganize structure
taken old-ish AA benchmarks for initial tests