Re-did The File Structure