cleaned up direcotry structure.