Improve project structure with minor changes.