Cleanup imports, fix package for SoundSystem class.