File Structure Changes

Fixing fatal error