Updated readme, re-org and improved example