Cleaned up unnecessary package naming.
Added activation/deactivation methods.