major package reorganisation
updated method visibility due to changed package structure
Merge branch 'packageRefact'