Updated according new repository structure