Composer update
Add new config helper
Add some config items
File reorg