Hooking up sound, changing dir structure a bit.