Refactoring packages
Inclusion of Hawk support
Merge branch 'AGSEC-49'