Changed package
Cleanup
Added Sample