small enhancements about layout and composer.json