changed project structure
changed project structure part 2