Reorganised package
Bumped version
Merge branch 'release/1.3.3'

* release/1.3.3:
  Bumped version