Redifne dir and fix namespace