Fixed directory structure #2