Moved libraries around, removed 'effects' flag

In preparation for reorganising the prelude