Refactored package
Updated the docs