changed project structure

changed project structure