Swap effect/effect' and lift/lift'
Reorganise file structure
A bit more reorganising, plus adding a package file