refactor package structure to eliminate 'API' unifies all packages for simplicity.

Also fixes error with VanillaInputExecutor and new SpoutAPI changes

Signed-off-by: Nick Minkler <sleaker@gmail.com>