Reorganizing for composer updates