Revert "changed structure"

This reverts commit 1f789c5fd1fe12bef34e9bdb5dd2238c819aaf4e.