Fix/improve demo sentences
Update files structure/namespaces