[Availability] Change project structure