Changed directory tree structure
Changed directory tree structure 2