Changed Directory Structure and adjusted file path names