Rearranged things so it should be easier to maintain.
Added the notion of psroot-extras to manage extras stuff.