Improve project skeleton