re-arranged dir layout