Updated name and project structure