Reorganized directories, relative paths.