OtterParts and Expanded Desktop

I thought you might want to pull those two commits ... since you're busy with restructuring.

BTW, just did a build based on your latest changes from today and all seems fine so far.