Fix composer file
Organize uses