Added structure. Refactored to use x_paths(damn google)