Improved directory structure with the source code under src