Added shell-output moved some headers