Minor File Structure Tweaks