Fixing up File Structure