Move class to package, Add implicit
Improve documentation