Appropriate changes as per new project structure.