VER 1.14 - Tidy up package structure