Change project structure and made some comments