Improved structure
Improved file structure