Update samples to new module structure
Update todo and README