Improve project structure
Continue improve project structure