Initial upload of updated code

New upload based on updated S4E-release code.
Changed licensing from tri-license to MPL2.0