Rethink dir structure