Added higher-level API
Documentation fix; struct shuffling