Tweaked info files and file structure