Updated to reflect changes in project structure