rethinking dir structure