directory mess...
fix directory mess still