Reorganized dev dependencies
Improved structure