Tweaked file structure.