CNET: refactoring of project structure