Added Scanner
Try to structure our App