changed structure paths and names