added better path structure