Revamp project infra