Added some settings content
Changed project structure