actually corrected directory structure