Refactored package structure
Test that method level annotation overrides class level
Tidied getActive method