re-shuffle to composer-ize the framework