Improve project architecture