Continuing with changing project structure.