Updated projects structured and types naming