Fix directory structure.
Remove old directory