Initial Version.
Moved types into seperate package.
Updated base package references.