todo about directory dependencies; simplify files