fixed file paths and directory structure