Composer-ly restructuring