Improve project structure and update terms