Changed directory strucucture
Changed directory strucucture