Minor fixes to throws clause
Package restructure to match other modules.