Better File Structure to options