Change directory structure to fit namespaces used
Update  example file, in accordance with the restructuring of directories