Directory restructuring
include world lines