Fixed directory
Changed directory structure