Rename and cleanup dependencies into composer.json, a bit of code cleanup