complete code
Changes in project structure