Changed project structure and test
Changed project structure and test