minor changes. reworking structure of package.  UNDER DEVELOPMENT