updated directory structure but still not happy about unary paths