updating package dir structure and check errors
small clean up
collate no longer needed.
updated docs