Refactored namespaces.
Added package info.