Improve project organization